Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 6 Jul 2011 20:13:02 +0000 (13:13 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 6 Jul 2011 20:13:02 +0000 (13:13 -0700)
commitc976b529760a90de656b1955d9acd1151cbf80a7
tree834c4e3b4608846c0e9e41b312e61aa3ee0e71ed
parent57b55daff19b85d55b76c9325a6008038b8a26d1
parentf1d8e87ffa64b67396e739af658411b89c7d80dd
Merge from trunk.